Revert "Always enable trivial-httpd for tests"

This reverts commit 82699a67dbb6bfcc9452bb969e7872809232a84f.

diff --git a/Makefile.am b/Makefile.am
index 673dbf88de559804e8a9a747ac7805661d13175a..cd04a055045adafdf4f7875ab91f35d1c5ab1f2e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \
        --enable-gtk-doc \
        --enable-man \
        --disable-maintainer-mode \
-       --enable-trivial-httpd-cmdline \
        $(NULL)
 
 GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make

diff --git a/ci/build.sh b/ci/build.sh
index 806af050b7804bdd3be7ec3970c4ca6ab309e520..0901507498f2e8df4a10982773feb723dd75b5c2 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -22,11 +22,6 @@ case "${CONFIGOPTS:-}" in
         fi
         ;;
 esac
-# unless libsoup is disabled, enable trivial-httpd for the tests
-case "${CONFIGOPTS:-}" in
-    *--without-soup*) ;;
-    *) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;;
-esac
 
 # always fail on warnings; https://github.com/ostreedev/ostree/pull/971
 # NB: this disables the default set of flags from configure.ac

diff --git a/ci/travis-build.sh b/ci/travis-build.sh
index 7c85313a2d327cf755c24857823162a391d51943..3fd969bdced6a0fe55b4bbecea7c0d478a0d57c1 100755 (executable)
--- a/ci/travis-build.sh
+++ b/ci/travis-build.sh
@@ -85,7 +85,6 @@ make="make -j${ci_parallel} V=1 VERBOSE=1"
 
 ../configure \
     --enable-always-build-tests \
-    --enable-trivial-httpd-cmdline \
     ${ci_configopts}
     "$@"